From dc9dcba5a4f9dd700db6235a6b08cd641497d291 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sat, 26 Jun 2004 07:08:31 +0000 Subject: [PATCH] Use admin password all the time --- maintenance/commandLine.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc index ee1d78e863..dc895f129c 100644 --- a/maintenance/commandLine.inc +++ b/maintenance/commandLine.inc @@ -77,8 +77,8 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) { # This is for the IRC scripts, which now run as the apache user # The apache user doesn't have access to the wikiadmin_pass command if ( $_ENV['USER'] != "apache" ) { - $wgDBadminuser = "wikiadmin"; - $wgDBadminpassword = trim(`wikiadmin_pass`); + $wgDBuser = $wgDBadminuser = "wikiadmin"; + $wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`); } putenv( "wikilang=$lang"); @@ -105,8 +105,11 @@ if ( $sep == ":" && strpos( `hostname -a`, "wikimedia.org" ) !== false ) { # Turn off output buffering again, it might have been turned on in the settings files @ob_end_flush(); -# Same with this one +# Same with these $wgCommandLineMode = true; +$wgDBuser = $wgDBadminuser; +$wgDBpassword = $wgDBadminpassword; + $wgUsePHPTal = false; define("MEDIAWIKI",true); -- 2.20.1